Google Git
Sign in
chromium / external / gitster / git-htmldocs / 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 / . / git-show-branch.html
blob: 01bc2507a2cf5063a564b91d40ddce9c36ac9dc7 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-show-branch(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]30 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]35 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]50h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]90 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]91}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]182
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]285
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]293}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]302}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]429 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573git-show-branch(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-show-branch -
Junio C Hamano01078922006-03-10 00:31:47[diff] [blame]578 Show branches and their commits
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]584<div class="sectionbody">
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]585<div class="verseblock">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]586<div class="verseblock-content"><em>git show-branch</em> [-a|--all] [-r|--remotes] [--topo-order | --date-order]
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]587 [--current] [--color[=&lt;when&gt;] | --no-color] [--sparse]
Junio C Hamano2bb13102006-03-06 07:10:21[diff] [blame]588 [--more=&lt;n&gt; | --list | --independent | --merge-base]
Junio C Hamanocca56612009-06-03 08:27:33[diff] [blame]589 [--no-name | --sha1-name] [--topics]
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]590 [(&lt;rev&gt; | &lt;glob&gt;)&#8230;]
591<em>git show-branch</em> (-g|--reflog)[=&lt;n&gt;[,&lt;base&gt;]] [--list] [&lt;ref&gt;]</div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]592<div class="verseblock-attribution">
593</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]594</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]595<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]596<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]597<div class="paragraph"><p>Shows the commit ancestry graph starting from the commits named
Junio C Hamano4fdccb22010-02-19 09:58:14[diff] [blame]598with &lt;rev&gt;s or &lt;globs&gt;s (or all refs under refs/heads
599and/or refs/tags) semi-visually.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]600<div class="paragraph"><p>It cannot show more than 29 branches and commits at a time.</p></div>
601<div class="paragraph"><p>It uses <tt>showbranch.default</tt> multi-valued configuration items if
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]602no &lt;rev&gt; nor &lt;glob&gt; is given on the command line.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]603</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]604<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]605<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]606<div class="dlist"><dl>
607<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]608&lt;rev&gt;
609</dt>
610<dd>
611<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]612 Arbitrary extended SHA1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>)
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]613 that typically names a branch head or a tag.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]614</p>
615</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]616<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]617&lt;glob&gt;
618</dt>
619<dd>
620<p>
621 A glob pattern that matches branch or tag names under
Junio C Hamano4fdccb22010-02-19 09:58:14[diff] [blame]622 refs/. For example, if you have many topic
623 branches under refs/heads/topic, giving
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]624 <tt>topic/*</tt> would show all of them.
625</p>
626</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]627<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]628-r
629</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]630<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]631--remotes
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]632</dt>
633<dd>
634<p>
Junio C Hamano30e1db12006-12-23 10:29:52[diff] [blame]635 Show the remote-tracking branches.
636</p>
637</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]638<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]639-a
640</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]641<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]642--all
Junio C Hamano30e1db12006-12-23 10:29:52[diff] [blame]643</dt>
644<dd>
645<p>
646 Show both remote-tracking branches and local branches.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]647</p>
648</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]649<dt class="hdlist1">
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]650--current
651</dt>
652<dd>
653<p>
654 With this option, the command includes the current
655 branch to the list of revs to be shown when it is not
656 given on the command line.
657</p>
658</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]659<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]660--topo-order
661</dt>
662<dd>
663<p>
664 By default, the branches and their commits are shown in
665 reverse chronological order. This option makes them
666 appear in topological order (i.e., descendant commits
667 are shown before their parents).
668</p>
669</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]670<dt class="hdlist1">
Junio C Hamanocca56612009-06-03 08:27:33[diff] [blame]671--date-order
672</dt>
673<dd>
674<p>
675 This option is similar to <em>--topo-order</em> in the sense that no
676 parent comes before all of its children, but otherwise commits
677 are ordered according to their commit date.
678</p>
679</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]680<dt class="hdlist1">
Junio C Hamano872c5682006-07-07 06:05:40[diff] [blame]681--sparse
682</dt>
683<dd>
684<p>
685 By default, the output omits merges that are reachable
686 from only one tip being shown. This option makes them
687 visible.
688</p>
689</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]690<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]691--more=&lt;n&gt;
692</dt>
693<dd>
694<p>
695 Usually the command stops output upon showing the commit
696 that is the common ancestor of all the branches. This
697 flag tells the command to go &lt;n&gt; more common commits
698 beyond that. When &lt;n&gt; is negative, display only the
699 &lt;reference&gt;s given, without showing the commit ancestry
700 tree.
701</p>
702</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]703<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]704--list
705</dt>
706<dd>
707<p>
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]708 Synonym to <tt>--more=-1</tt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]709</p>
710</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]711<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]712--merge-base
713</dt>
714<dd>
715<p>
Junio C Hamanofd9274d2009-08-05 21:21:39[diff] [blame]716 Instead of showing the commit list, determine possible
717 merge bases for the specified commits. All merge bases
718 will be contained in all specified commits. This is
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]719 different from how <a href="git-merge-base.html">git-merge-base(1)</a> handles
Junio C Hamanofd9274d2009-08-05 21:21:39[diff] [blame]720 the case of three or more commits.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]721</p>
722</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]723<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]724--independent
725</dt>
726<dd>
727<p>
728 Among the &lt;reference&gt;s given, display only the ones that
729 cannot be reached from any other &lt;reference&gt;.
730</p>
731</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]732<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]733--no-name
734</dt>
735<dd>
736<p>
737 Do not show naming strings for each commit.
738</p>
739</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]740<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]741--sha1-name
742</dt>
743<dd>
744<p>
745 Instead of naming the commits using the path to reach
746 them from heads (e.g. "master~2" to mean the grandparent
747 of "master"), name them with the unique prefix of their
748 object names.
749</p>
750</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]751<dt class="hdlist1">
Junio C Hamano52401ef2006-12-19 00:54:38[diff] [blame]752--topics
753</dt>
754<dd>
755<p>
756 Shows only commits that are NOT on the first branch given.
757 This helps track topic branches by hiding any commit that
758 is already in the main line of development. When given
759 "git show-branch --topics master topic1 topic2", this
Junio C Hamano6926bef2007-06-16 09:54:05[diff] [blame]760 will show the revisions given by "git rev-list &#94;master
Junio C Hamano52401ef2006-12-19 00:54:38[diff] [blame]761 topic1 topic2"
762</p>
763</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]764<dt class="hdlist1">
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]765-g
766</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]767<dt class="hdlist1">
Junio C Hamano16cf1582007-02-05 07:21:48[diff] [blame]768--reflog[=&lt;n&gt;[,&lt;base&gt;]] [&lt;ref&gt;]
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]769</dt>
770<dd>
771<p>
Junio C Hamanodb450ba2007-01-21 08:57:14[diff] [blame]772 Shows &lt;n&gt; most recent ref-log entries for the given
773 ref. If &lt;base&gt; is given, &lt;n&gt; entries going back from
Junio C Hamanofa0d4cf2007-01-25 02:23:58[diff] [blame]774 that entry. &lt;base&gt; can be specified as count or date.
Junio C Hamanoa3bb6eb2009-02-05 01:26:33[diff] [blame]775 When no explicit &lt;ref&gt; parameter is given, it defaults to the
Junio C Hamano16cf1582007-02-05 07:21:48[diff] [blame]776 current branch (or <tt>HEAD</tt> if it is detached).
Junio C Hamanod793de52006-12-26 09:11:43[diff] [blame]777</p>
778</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]779<dt class="hdlist1">
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]780--color[=&lt;when&gt;]
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]781</dt>
782<dd>
783<p>
784 Color the status sign (one of these: <tt>*</tt> <tt>!</tt> <tt>+</tt> <tt>-</tt>) of each commit
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]785 corresponding to the branch it&#8217;s in.
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]786 The value must be always (the default), never, or auto.
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]787</p>
788</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]789<dt class="hdlist1">
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]790--no-color
791</dt>
792<dd>
793<p>
794 Turn off colored output, even when the configuration file gives the
795 default to color output.
Junio C Hamano4aa0bcc2010-03-03 05:13:12[diff] [blame]796 Same as <tt>--color=never</tt>.
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]797</p>
798</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]799</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]800<div class="paragraph"><p>Note that --more, --list, --independent and --merge-base options
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]801are mutually exclusive.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]802</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]803<h2 id="_output">OUTPUT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]804<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]805<div class="paragraph"><p>Given N &lt;references&gt;, the first N lines are the one-line
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]806description from their commit message. The branch head that is
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]807pointed at by $GIT_DIR/HEAD is prefixed with an asterisk <tt>*</tt>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]808character while other heads are prefixed with a <tt>!</tt> character.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]809<div class="paragraph"><p>Following these N lines, one-line log for each commit is
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]810displayed, indented N places. If a commit is on the I-th
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]811branch, the I-th indentation character shows a <tt>+</tt> sign;
812otherwise it shows a space. Merge commits are denoted by
813a <tt>-</tt> sign. Each commit shows a short name that
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]814can be used as an extended SHA1 to name that commit.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]815<div class="paragraph"><p>The following example shows three branches, "master", "fixes"
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]816and "mhf":</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]817<div class="listingblock">
818<div class="content">
819<pre><tt>$ git show-branch master fixes mhf
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]820* [master] Add 'git show-branch'.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]821 ! [fixes] Introduce "reset type" flag to "git reset"
822 ! [mhf] Allow "+remote:local" refspec to cause --force when fetching.
823---
824 + [mhf] Allow "+remote:local" refspec to cause --force when fetching.
825 + [mhf~1] Use git-octopus when pulling more than one heads.
826 + [fixes] Introduce "reset type" flag to "git reset"
827 + [mhf~2] "git fetch --force".
828 + [mhf~3] Use .git/remote/origin, not .git/branches/origin.
829 + [mhf~4] Make "git pull" and "git fetch" default to origin
830 + [mhf~5] Infamous 'octopus merge'
831 + [mhf~6] Retire git-parse-remote.
832 + [mhf~7] Multi-head fetch.
833 + [mhf~8] Start adding the $GIT_DIR/remotes/ support.
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]834*++ [master] Add 'git show-branch'.</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]835</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]836<div class="paragraph"><p>These three branches all forked from a common commit, [master],
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]837whose commit message is "Add &#39;git show-branch&#39;".
838The "fixes" branch adds one commit "Introduce "reset type" flag to
839"git reset"". The "mhf" branch adds many other commits.
840The current branch is "master".</p></div>
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]841</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]842<h2 id="_example">EXAMPLE</h2>
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]843<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]844<div class="paragraph"><p>If you keep your primary branches immediately under
Junio C Hamano4fdccb22010-02-19 09:58:14[diff] [blame]845<tt>refs/heads</tt>, and topic branches in subdirectories of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]846it, having the following in the configuration file may help:</p></div>
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]847<div class="listingblock">
848<div class="content">
849<pre><tt>[showbranch]
850 default = --topo-order
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]851 default = heads/*</tt></pre>
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]852</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]853<div class="paragraph"><p>With this, <tt>git show-branch</tt> without extra parameters would show
Junio C Hamano38064d52006-01-15 10:13:49[diff] [blame]854only the primary branches. In addition, if you happen to be on
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]855your topic branch, it is shown as well.</p></div>
Junio C Hamanodb450ba2007-01-21 08:57:14[diff] [blame]856<div class="listingblock">
857<div class="content">
Junio C Hamanof62a11d2008-12-21 12:16:36[diff] [blame]858<pre><tt>$ git show-branch --reflog="10,1 hour ago" --list master</tt></pre>
Junio C Hamanodb450ba2007-01-21 08:57:14[diff] [blame]859</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]860<div class="paragraph"><p>shows 10 reflog entries going back from the tip as of 1 hour ago.
Junio C Hamanodb450ba2007-01-21 08:57:14[diff] [blame]861Without <tt>--list</tt>, the output also shows how these tips are
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]862topologically related with each other.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]863</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]864<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]865<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]866<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]867</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]868</div>
869<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]870<div id="footer">
871<div id="footer-text">
Junio C Hamano02194af2011-11-17 20:33:59[diff] [blame]872Last updated 2011-11-15 13:45:02 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]873</div>
874</div>
875</body>
876</html>